From 84b4b812e6b3ada9960541ced26bd2f6b97aea27 Mon Sep 17 00:00:00 2001 From: Alastair Tse Date: Thu, 19 Oct 2006 11:36:49 +0100 Subject: [PATCH] [SOLARIS] Xen daemons are managed separately, so we need a way to start just xend, and we need to disable xend's self-restarter. Merged with Xen API Tree. Signed-off-by: John Levon --- tools/python/xen/xend/server/SrvDaemon.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/python/xen/xend/server/SrvDaemon.py b/tools/python/xen/xend/server/SrvDaemon.py index 65f042d1b5..0455811aac 100644 --- a/tools/python/xen/xend/server/SrvDaemon.py +++ b/tools/python/xen/xend/server/SrvDaemon.py @@ -17,6 +17,7 @@ import traceback import xen.lowlevel.xc from xen.xend.XendLogging import log +from xen.xend import osdep import relocate import SrvServer @@ -168,8 +169,14 @@ class Daemon: # ready to receive requests. All subsequent restarts we don't # want this behaviour, or the pipe will eventually fill up, so # we just pass None into run in subsequent cases (by clearing w - # in the parent of the first fork). + # in the parent of the first fork). On some operating systems, + # restart is managed externally, so we won't fork, and just exit. while True: + + if not osdep.xend_autorestart: + self.run(os.fdopen(w, 'w')) + break + pid = self.fork_pid() if pid: if w is not None: -- 2.30.2